bitkeeper revision 1.825 (406025cfC03xuc67hhXT_zgB13escw)

xc_linux_save.c, xc_linux_restore.c, balloon.c, README, Makefile:
  xeno -> xen renames.

diff --git a/Makefile b/Makefile
index 1c5b4c73700e3a7dcb024c68cfb28b882987bc54..05106afd5b44c00af18049347ecf820b4b32a934 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 
 # Grand Unified Makefile for Xen.
 #
-# Builds everything except Xenolinux:
+# Builds everything except Linux:
 #  cd xenolinux-<version>-sparse
 #  ./mkbuildtree <build dir>
 #  cd <build dir>

diff --git a/tools/Makefile b/tools/Makefile
index 3bc0d81eaf18a3bc09011d153b5e75a7dae60c79..0d4c43fb241afa0c26cf897bd526972c6de7e86d 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,21 +1,3 @@
-#
-# Grand Unified Makefile for Xen.
-#
-# Keir Fraser, 6/5/2003
-#
-# Builds everything except Xenolinux:
-#  cd xenolinux-<version>-sparse
-#  ./mkbuildtree <build dir>
-#  cd <build dir> && make oldconfig && make dep && make bzImage
-#  (<build dir> should be a vanilla linux tree with matching version)
-#
-# If you get errors in tools/domctl or tools/vdmanager, then you need
-# the latest Java 2 SDK on your execution path: <http://java.sun.com>
-# Also, you will need Apache's 'ant' build tool: <http://ant.apache.org>
-#
-# If you received this source as part of a Xen release, you should find
-# that appropriate versions of the build tools are already installed in
-# the initial system setup.
 
 all:   
        $(MAKE) -C balloon

diff --git a/tools/balloon/README b/tools/balloon/README
index 430e8f41bf2c48bd91429742eeff94bec842dde5..16c1707b2e31028e7c25b23321b994a0894c6f9f 100644 (file)
--- a/tools/balloon/README
+++ b/tools/balloon/README
@@ -1,17 +1,17 @@
-Xeno Balloon driver supports two operations:
 
-1. Inflating - which means domain giving up pages of mem to xen.
-2. Deflating - which means reclaiming memory pages from xen.
+The Xen balloon driver supports two operations:
+ 1. Inflating - which means domain giving up pages of memory to Xen.
+ 2. Deflating - which means reclaiming memory pages from Xen.
 
-Currently, domain can only claim pages from xen up to the number of 
+Currently a domain can only claim pages from Xen up to the number of 
 previously released ones. This is to change. 
 
 Example:
 
 # balloon inflate 1000
 
-Give up 1000 pages to xen.
+Give up 1000 pages to Xen.
 
 # balloon deflate 1000
 
-Claim 1000 pages from xen.
+Claim 1000 pages from Xen.

diff --git a/tools/balloon/balloon.c b/tools/balloon/balloon.c
index a8b6c406df3f5ba30ea20abd55e3b059f03736de..e305de5876975fa96324a6dfaa549b22fce3ebd7 100644 (file)
--- a/tools/balloon/balloon.c
+++ b/tools/balloon/balloon.c
@@ -19,15 +19,14 @@
 #define INFLATE_BALLOON      "inflate"   /* return mem to hypervisor */
 #define DEFLATE_BALLOON      "deflate"   /* claim mem from hypervisor */
 
-/* THIS IS TAKEN FROM XENOLINUX BALLOON DRIVER */
+/* THIS IS SHARED WITH THE LINUX BALLOON DRIVER */
 #define USER_INFLATE_BALLOON  1   /* return mem to hypervisor */
 #define USER_DEFLATE_BALLOON  2   /* claim mem from hypervisor */
 typedef struct user_balloon_op {
     unsigned int    op;
     unsigned long   size;
 } user_balloon_op_t;
-/* END OF CODE TAKEN FROM XENOLINUX BALLOON DRIVER */
-
+/* END OF CODE SHARED WITH THE LINUX BALLOON DRIVER */
 
 static int open_balloon_proc()
 {

diff --git a/tools/xc/lib/xc_linux_restore.c b/tools/xc/lib/xc_linux_restore.c
index c82bb5c10d87381c5d62afe8ab7877cb15175d86..d06804ed935a42dd56c1a6298f7fcab86ed04443 100644 (file)
--- a/tools/xc/lib/xc_linux_restore.c
+++ b/tools/xc/lib/xc_linux_restore.c
@@ -62,7 +62,7 @@ int xc_linux_restore(int xc_handle,
     u64 dom = 0ULL;
     unsigned int prev_pc, this_pc;
     
-    /* Number of page frames in use by this XenoLinux session. */
+    /* Number of page frames in use by this Linux session. */
     unsigned long nr_pfns;
 
     /* The new domain's shared-info frame number. */
@@ -72,7 +72,7 @@ int xc_linux_restore(int xc_handle,
     /* A copy of the CPU context of the guest. */
     full_execution_context_t ctxt;
 
-    /* First 16 bytes of the state file must contain 'XenoLinuxSuspend'. */
+    /* First 16 bytes of the state file must contain 'LinuxGuestRecord'. */
     char signature[16];
     
     /* A copy of the domain's name. */
@@ -116,7 +116,7 @@ int xc_linux_restore(int xc_handle,
 
     /* Start writing out the saved-domain record. */
     if ( !checked_read(gfd, signature, 16) ||
-         (memcmp(signature, "XenoLinuxSuspend", 16) != 0) )
+         (memcmp(signature, "LinuxGuestRecord", 16) != 0) )
     {
         ERROR("Unrecognised state format -- no signature found");
         goto out;

diff --git a/tools/xc/lib/xc_linux_save.c b/tools/xc/lib/xc_linux_save.c
index 5168a58bd2142bad2abb06d1abbd07596c89b9b7..a702a4a2920d1f4cc70b19c8c54250748be1c8b4 100644 (file)
--- a/tools/xc/lib/xc_linux_save.c
+++ b/tools/xc/lib/xc_linux_save.c
@@ -174,7 +174,7 @@ int xc_linux_save(int xc_handle,
     /* A cheesy test to see whether the domain contains valid state. */
     if ( ctxt.pt_base == 0 )
     {
-        ERROR("Domain is not in a valid Xenolinux state");
+        ERROR("Domain is not in a valid Linux guest OS state");
         goto out;
     }
 
@@ -308,7 +308,7 @@ int xc_linux_save(int xc_handle,
 
     /* Start writing out the saved-domain record. */
     ppage = map_pfn_readonly(pm_handle, shared_info_frame);
-    if ( !checked_write(gfd, "XenoLinuxSuspend",    16) ||
+    if ( !checked_write(gfd, "LinuxGuestRecord",    16) ||
          !checked_write(gfd, name,                  sizeof(name)) ||
          !checked_write(gfd, &srec.nr_pfns,         sizeof(unsigned long)) ||
          !checked_write(gfd, &ctxt,                 sizeof(ctxt)) ||